Mask G_FILE_TYPE_SHORTCUT as a directory (#561494)

2008-12-15  Tomas Bzatek  <tbzatek@redhat.com>

        * gtk/gtkfilechooserdefault.c: (list_row_activated):
        * gtk/gtkfilesystem.c: (_gtk_file_info_consider_as_directory):
        Mask G_FILE_TYPE_SHORTCUT as a directory (#561494)

svn path=/trunk/; revision=21906

diff --git a/ChangeLog b/ChangeLog
index d1317be76323bee2e029b32ba83035d3ea4ce784..40972e5eddb76beac21511ad45c9fb063b75d063 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-15  Tomas Bzatek  <tbzatek@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c: (list_row_activated):
+       * gtk/gtkfilesystem.c: (_gtk_file_info_consider_as_directory):
+       Mask G_FILE_TYPE_SHORTCUT as a directory (#561494)
+
 2008-12-13  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e7910ad08fd7fe427a6e23be75dcf19721ee71fc..55c8470d8a0223db2c61491db1949928c7350ebd 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -10718,7 +10718,8 @@ list_row_activated (GtkTreeView           *tree_view,
            const gchar *target_uri;
 
             file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter);
-            if (g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE) 
+            if (g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE ||
+                g_file_info_get_file_type (info) == G_FILE_TYPE_SHORTCUT) 
               {
                 target_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
                 if (target_uri)

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index f4b78d4d546c0e0276134a636f80e905a8e0e648..549671da5af96a1879d01fd1e30d23762dee49cc 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1803,6 +1803,7 @@ _gtk_file_info_consider_as_directory (GFileInfo *info)
   GFileType type = g_file_info_get_file_type (info);
   
   return (type == G_FILE_TYPE_DIRECTORY ||
-          type == G_FILE_TYPE_MOUNTABLE);
+          type == G_FILE_TYPE_MOUNTABLE ||
+          type == G_FILE_TYPE_SHORTCUT);
 }